This is a small patch that makes a cross compiler successfully compile

the sources under the tools directory.  This patch became necessary
after qemu-dm is updated to a newer version.

Signed-off-by: Hiroya INAKOSHI <inakoshi.hiroya@jp.fujitsu.com>

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 9417b976acbf25e7fb2bc3e89c7e75d88183dc0d..38f8ac686cc746473036000e623b7bded4ff3134 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -61,7 +61,7 @@ libblktap.a: $(OBJS)
              -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) libblktap.so
-       ar rc $@ libblktap.so
+       $(AR) rc $@ libblktap.so
 
 .PHONY: TAGS all build clean install libblktap
 

diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile
index 8d134cc0050ad7d7c9a007546ffa0255a4920ad9..f926670e672692234daef2552920e4e89ec8ac79 100644 (file)
--- a/tools/libaio/src/Makefile
+++ b/tools/libaio/src/Makefile
@@ -1,3 +1,6 @@
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 prefix=/usr
 includedir=$(prefix)/include
 libdir=$(prefix)/lib
@@ -44,8 +47,8 @@ $(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h
 
 libaio.a: $(libaio_objs)
        rm -f libaio.a
-       ar r libaio.a $^
-       ranlib libaio.a
+       $(AR) r libaio.a $^
+       $(RANLIB) libaio.a
 
 $(libname): $(libaio_sobjs) libaio.map
        $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index b568a24c5ac0199d8732d6b4a969c970e063d21c..279a5a53548bef8bd611670d290592e890fc90a6 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -98,7 +98,7 @@ libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
        $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o $@ $^ -lpthread
 
 libxenstore.a: xs.o xs_lib.o
-       ar rcs libxenstore.a $^
+       $(AR) rcs libxenstore.a $^
 
 .PHONY: clean
 clean: testsuite-clean